gl driver: Remove more unused API

diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index d29cea62837f2945f9fc0d9ab9b140c30095b351..5f9735c08c516f5d4e243ea9f05adf4fa481f2c1 100644 (file)
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -43,7 +43,6 @@ struct _GskGLDriver
   GHashTable *textures;
 
   const Texture *bound_source_texture;
-  const Texture *bound_mask_texture;
   const Fbo *bound_fbo;
 
   int max_texture_size;
@@ -182,7 +181,6 @@ gsk_gl_driver_end_frame (GskGLDriver *self)
   g_return_if_fail (self->in_frame);
 
   self->bound_source_texture = NULL;
-  self->bound_mask_texture = NULL;
   self->bound_fbo = NULL;
 
   self->default_fbo.fbo_id = 0;
@@ -499,33 +497,6 @@ gsk_gl_driver_bind_source_texture (GskGLDriver *driver,
     }
 }
 
-void
-gsk_gl_driver_bind_mask_texture (GskGLDriver *driver,
-                                 int          texture_id)
-{
-  Texture *t;
-
-  g_return_if_fail (GSK_IS_GL_DRIVER (driver));
-  g_return_if_fail (driver->in_frame);
-
-  t = gsk_gl_driver_get_texture (driver, texture_id);
-  if (t == NULL)
-    {
-      g_critical ("No texture %d found.", texture_id);
-      return;
-    }
-
-  if (driver->bound_mask_texture != t)
-    {
-      glActiveTexture (GL_TEXTURE0 + 1);
-      glBindTexture (GL_TEXTURE_2D, t->texture_id);
-
-      glActiveTexture (GL_TEXTURE0);
-
-      driver->bound_mask_texture = t;
-    }
-}
-
 gboolean
 gsk_gl_driver_bind_render_target (GskGLDriver *driver,
                                   int          texture_id)
@@ -599,7 +570,7 @@ gsk_gl_driver_init_texture_empty (GskGLDriver *driver,
       return;
     }
 
-  if (!(driver->bound_source_texture == t || driver->bound_mask_texture == t))
+  if (driver->bound_source_texture != t)
     {
       g_critical ("You must bind the texture before initializing it.");
       return;
@@ -633,7 +604,7 @@ gsk_gl_driver_init_texture_with_surface (GskGLDriver     *self,
       return;
     }
 
-  if (!(self->bound_source_texture == t || self->bound_mask_texture == t))
+  if (self->bound_source_texture != t)
     {
       g_critical ("You must bind the texture before initializing it.");
       return;

diff --git a/gsk/gl/gskgldriverprivate.h b/gsk/gl/gskgldriverprivate.h
index 35cf1ceea1bfd3226b9859290651762bfefdde72..17e7c5c84aece1b0a415fdeb0d86fde09edf7e96 100644 (file)
--- a/gsk/gl/gskgldriverprivate.h
+++ b/gsk/gl/gskgldriverprivate.h
@@ -40,8 +40,6 @@ int             gsk_gl_driver_create_render_target      (GskGLDriver     *driver
 
 void            gsk_gl_driver_bind_source_texture       (GskGLDriver     *driver,
                                                          int              texture_id);
-void            gsk_gl_driver_bind_mask_texture         (GskGLDriver     *driver,
-                                                         int              texture_id);
 gboolean        gsk_gl_driver_bind_render_target        (GskGLDriver     *driver,
                                                          int              texture_id);